diff options
| author | ameerj <52414509+ameerj@users.noreply.github.com> | 2023-01-29 03:21:42 +0100 |
|---|---|---|
| committer | ameerj <52414509+ameerj@users.noreply.github.com> | 2023-01-29 03:23:52 +0100 |
| commit | 0d820f2dab70c27f811f6a62cc0850fc9969c9f5 (patch) | |
| tree | ed41f749a176018a7d3b30613a911e2605f9f1c1 | |
| parent | Merge pull request #9685 from liamwhite/minmax (diff) | |
| download | yuzu-0d820f2dab70c27f811f6a62cc0850fc9969c9f5.tar yuzu-0d820f2dab70c27f811f6a62cc0850fc9969c9f5.tar.gz yuzu-0d820f2dab70c27f811f6a62cc0850fc9969c9f5.tar.bz2 yuzu-0d820f2dab70c27f811f6a62cc0850fc9969c9f5.tar.lz yuzu-0d820f2dab70c27f811f6a62cc0850fc9969c9f5.tar.xz yuzu-0d820f2dab70c27f811f6a62cc0850fc9969c9f5.tar.zst yuzu-0d820f2dab70c27f811f6a62cc0850fc9969c9f5.zip | |
| -rw-r--r-- | src/shader_recompiler/ir_opt/texture_pass.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/shader_recompiler/ir_opt/texture_pass.cpp b/src/shader_recompiler/ir_opt/texture_pass.cpp index 9718c6921..14496b911 100644 --- a/src/shader_recompiler/ir_opt/texture_pass.cpp +++ b/src/shader_recompiler/ir_opt/texture_pass.cpp @@ -386,8 +386,10 @@ public: return Add(texture_buffer_descriptors, desc, [&desc](const auto& existing) { return desc.cbuf_index == existing.cbuf_index && desc.cbuf_offset == existing.cbuf_offset && + desc.shift_left == existing.shift_left && desc.secondary_cbuf_index == existing.secondary_cbuf_index && desc.secondary_cbuf_offset == existing.secondary_cbuf_offset && + desc.secondary_shift_left == existing.secondary_shift_left && desc.count == existing.count && desc.size_shift == existing.size_shift && desc.has_secondary == existing.has_secondary; }); @@ -405,15 +407,20 @@ public: } u32 Add(const TextureDescriptor& desc) { - return Add(texture_descriptors, desc, [&desc](const auto& existing) { + const u32 index{Add(texture_descriptors, desc, [&desc](const auto& existing) { return desc.type == existing.type && desc.is_depth == existing.is_depth && desc.has_secondary == existing.has_secondary && desc.cbuf_index == existing.cbuf_index && desc.cbuf_offset == existing.cbuf_offset && + desc.shift_left == existing.shift_left && desc.secondary_cbuf_index == existing.secondary_cbuf_index && desc.secondary_cbuf_offset == existing.secondary_cbuf_offset && + desc.secondary_shift_left == existing.secondary_shift_left && desc.count == existing.count && desc.size_shift == existing.size_shift; - }); + })}; + // TODO: Read this from TIC + texture_descriptors[index].is_multisample |= desc.is_multisample; + return index; } u32 Add(const ImageDescriptor& desc) { |